Skip to content

Conversation

@jen-huang
Copy link
Contributor

@jen-huang jen-huang commented Aug 12, 2025

Summary

Resolves #230902. This PR removes system-managed properties (dates) from the retrieved index templates when updating the same index template (triggered when experimental datastream feature settings have been changed). The test that was failing is now re-enabled.

Similar to #231505, this is due to ES introducing these new date/timestamp fields in elastic/elasticsearch#131536.

…s due to experimental datastream feature changes
@jen-huang jen-huang self-assigned this Aug 12, 2025
@jen-huang jen-huang requested a review from a team as a code owner August 12, 2025 20:19
@jen-huang jen-huang added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting Team:Fleet Team label for Observability Data Collection Fleet team labels Aug 12, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jen-huang jen-huang enabled auto-merge (squash) August 12, 2025 22:02
@mistic mistic disabled auto-merge August 13, 2025 19:22
@mistic mistic merged commit 9cdbe77 into elastic:main Aug 13, 2025
20 checks passed
@jen-huang jen-huang deleted the fix/230902 branch August 13, 2025 19:52
fkanout pushed a commit to fkanout/kibana that referenced this pull request Aug 14, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
NicholasPeretti pushed a commit to NicholasPeretti/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
@jen-huang jen-huang added backport:version Backport to applied version labels v9.1.3 v8.19.3 v9.0.6 and removed backport:skip This PR does not require backporting labels Aug 18, 2025
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.0, 9.1

https://github.com/elastic/kibana/actions/runs/17055283179

@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.0, 9.1

https://github.com/elastic/kibana/actions/runs/17055283055

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
8.19
9.0
9.1 An unhandled error occurred. Please see the logs for details

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 231524

Questions ?

Please refer to the Backport tool documentation

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.19
9.0
9.1

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Aug 19, 2025
…dex templates (#231524) (#232160)

# Backport

This will backport the following commits from `main` to `9.1`:
- [[UII] Remove system-managed properties (dates) when updating index
templates (#231524)](#231524)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-13T19:23:04Z","message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.2.0","v9.1.3","v8.19.3","v9.0.6"],"title":"[UII]
Remove system-managed properties (dates) when updating index
templates","number":231524,"url":"https://github.com/elastic/kibana/pull/231524","mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231524","number":231524,"mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},{"branch":"9.1","label":"v9.1.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Jen Huang <[email protected]>
kibanamachine added a commit that referenced this pull request Aug 19, 2025
…dex templates (#231524) (#232159)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[UII] Remove system-managed properties (dates) when updating index
templates (#231524)](#231524)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-13T19:23:04Z","message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.2.0","v9.1.3","v8.19.3","v9.0.6"],"title":"[UII]
Remove system-managed properties (dates) when updating index
templates","number":231524,"url":"https://github.com/elastic/kibana/pull/231524","mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231524","number":231524,"mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},{"branch":"9.1","label":"v9.1.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: Jen Huang <[email protected]>
kibanamachine added a commit that referenced this pull request Aug 19, 2025
…ndex templates (#231524) (#232158)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[UII] Remove system-managed properties (dates) when updating index
templates (#231524)](#231524)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-13T19:23:04Z","message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.2.0","v9.1.3","v8.19.3","v9.0.6"],"title":"[UII]
Remove system-managed properties (dates) when updating index
templates","number":231524,"url":"https://github.com/elastic/kibana/pull/231524","mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231524","number":231524,"mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},{"branch":"9.1","label":"v9.1.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: Jen Huang <[email protected]>
qn895 pushed a commit to qn895/kibana that referenced this pull request Aug 26, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.19.3 v9.0.6 v9.1.3 v9.2.0

Projects

None yet

4 participants